Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TASK] Add test-docs to make file #445

Merged
merged 3 commits into from
Apr 15, 2024
Merged

[TASK] Add test-docs to make file #445

merged 3 commits into from
Apr 15, 2024

Conversation

linawolf
Copy link
Member

Also adjust the gitignore as the newest ddev versions do not create one automatically anymore

releases: main, 12.4, 11.5

Also adjust the gitignore as the newest ddev versions do not create one automatically anymore

releases: main, 12.4, 11.5
.gitignore Outdated Show resolved Hide resolved
@linawolf linawolf merged commit 468d9b6 into main Apr 15, 2024
4 checks passed
@linawolf linawolf deleted the task/test-docs branch April 15, 2024 08:45
Copy link
Contributor

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply bb2fe2f... [TASK] Add test-docs to make file
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

stdout
Auto-merging .gitignore
CONFLICT (content): Merge conflict in .gitignore

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-11.5 11.5
# Navigate to the new working tree
cd .worktrees/backport-11.5
# Create a new branch
git switch --create backport-445-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick bb2fe2f8ebddd5eb1c37e1fd88429e8b70dc758f,43f280d437e2e346b85e29beeb4106e541da08ab,fd1336ec542bbf28ec290a67a620bf8f622bacfb
# Push it to GitHub
git push --set-upstream origin backport-445-to-11.5
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-11.5

Then, create a pull request where the base branch is 11.5 and the compare/head branch is backport-445-to-11.5.

Copy link
Contributor

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply bb2fe2f... [TASK] Add test-docs to make file
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

stdout
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-12.4 12.4
# Navigate to the new working tree
cd .worktrees/backport-12.4
# Create a new branch
git switch --create backport-445-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick bb2fe2f8ebddd5eb1c37e1fd88429e8b70dc758f,43f280d437e2e346b85e29beeb4106e541da08ab,fd1336ec542bbf28ec290a67a620bf8f622bacfb
# Push it to GitHub
git push --set-upstream origin backport-445-to-12.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-12.4

Then, create a pull request where the base branch is 12.4 and the compare/head branch is backport-445-to-12.4.

linawolf added a commit that referenced this pull request Apr 15, 2024
* [TASK] Add test-docs to make file

Also adjust the gitignore as the newest ddev versions do not create one automatically anymore

releases: main, 12.4, 11.5

* Update .gitignore

* Update .gitignore

(cherry picked from commit 468d9b6)
linawolf added a commit that referenced this pull request Apr 15, 2024
* [TASK] Add test-docs to make file

Also adjust the gitignore as the newest ddev versions do not create one automatically anymore

releases: main, 12.4, 11.5

* Update .gitignore

* Update .gitignore

(cherry picked from commit 468d9b6)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants